diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
index 285d051..b83ed6c 100644
--- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c
@@ -278,10 +278,10 @@
 
 	if (tmp) {
 		u64 addr;
-		if (addrcells && (*addrcells == 2))
-			addr = *tmp;
-		else
+		if (addrcells && (*addrcells == 1))
 			addr = *(u32 *)tmp;
+		else
+			addr = *tmp;
 
 		if (addr != CONFIG_SYS_CCSRBAR_PHYS)
 			printf("WARNING: The CCSRBAR address in your .dts "